--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit 79879c4e77ffb30ea746b1b97b74dcbe4f3bbca9
Parents : 193311b
Author : Jeremy O'Brien <956a74d715fe9cb2e9da0a19b067b414>
Signature : T66BB85Valid, signed by author
Date : 2026-07-14T09:12:07-04:00
Conversations: make "yesterday/N days ago" respect calendar days and not just hours
Changes
2 files changed, 14 insertions(+), 13 deletions(-)
Diff
diff --git a/nomadnet/ui/textui/Conversations.py b/nomadnet/ui/textui/Conversations.py
index feaedc9..bd71d3b 100644
--- a/nomadnet/ui/textui/Conversations.py
+++ b/nomadnet/ui/textui/Conversations.py
@@ -38,16 +38,16 @@ def relative_time(timestamp):
elif delta < 86400:
h = int(delta / 3600)
return str(h)+"h ago"
- elif delta < 172800:
- return "yesterday"
- elif delta < 604800:
- d = int(delta / 86400)
- return str(d)+"d ago"
- elif delta < 2592000:
- w = int(delta / 604800)
- return str(w)+"w ago"
else:
- return datetime.fromtimestamp(timestamp).strftime("%Y-%m-%d")
+ days = (datetime.fromtimestamp(now).date() - datetime.fromtimestamp(timestamp).date()).days
+ if days <= 1:
+ return "yesterday"
+ elif days < 7:
+ return str(days)+"d ago"
+ elif days < 30:
+ return str(days // 7)+"w ago"
+ else:
+ return datetime.fromtimestamp(timestamp).strftime("%Y-%m-%d")
def _format_size(size):
diff --git a/nomadnet/ui/textui/Network.py b/nomadnet/ui/textui/Network.py
index 0332139..db3cb57 100644
--- a/nomadnet/ui/textui/Network.py
+++ b/nomadnet/ui/textui/Network.py
@@ -1939,13 +1939,14 @@ def pretty_date(time=False):
from datetime import datetime
now = datetime.now()
if type(time) is int:
- diff = now - datetime.fromtimestamp(time)
+ then = datetime.fromtimestamp(time)
elif isinstance(time,datetime):
- diff = now - time
+ then = time
elif not time:
- diff = now - now
+ then = now
+ diff = now - then
second_diff = diff.seconds
- day_diff = diff.days
+ day_diff = (now.date() - then.date()).days
if day_diff < 0:
return ''
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────